Add missing GDK_THREADS_ENTER()/GDK_THREADS_LEAVE(). Cast second argument

Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
	GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
	* gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c,
	gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c,
	gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
	GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko)

diff --git a/ChangeLog b/ChangeLog
index 57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961..1489c7b5d3caa7bae9c2d93b6d948344d2b97633 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
+       GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
+       * gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c, 
+       gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c, 
+       gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
+       GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko) 
+
 Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961..1489c7b5d3caa7bae9c2d93b6d948344d2b97633 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
+       GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
+       * gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c, 
+       gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c, 
+       gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
+       GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko) 
+
 Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961..1489c7b5d3caa7bae9c2d93b6d948344d2b97633 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
+       GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
+       * gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c, 
+       gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c, 
+       gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
+       GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko) 
+
 Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961..1489c7b5d3caa7bae9c2d93b6d948344d2b97633 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
+       GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
+       * gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c, 
+       gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c, 
+       gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
+       GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko) 
+
 Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961..1489c7b5d3caa7bae9c2d93b6d948344d2b97633 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Wed Dec 17 23:20:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): Add missing
+       GDK_THREADS_ENTER()/GDK_THREADS_LEAVE().
+       * gtk/gtkcalendar.c, gtk/gtkclist.c, gtk/gtkexpander.c, 
+       gtk/gtklist.c, gtk/gtknotebook.c, gtk/gtkselection.c, 
+       gtk/gtkspinbutton.c: Cast second argument to g_timeout_add() to
+       GSourceFunc instead of GtkFunction.  (#129525, Olexiy Avramchenko) 
+
 Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index d838b3dfbb52d37a92edbe416189c0dc97e1df6e..8fbfe84a084f3c3f2490c248422f9829f57a1bd4 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2703,7 +2703,7 @@ calendar_timer (gpointer data)
        {
          private_data->need_timer = FALSE;
          private_data->timer = g_timeout_add (CALENDAR_TIMER_DELAY, 
-                                              (GtkFunction) calendar_timer, 
+                                              (GSourceFunc) calendar_timer, 
                                               (gpointer) calendar);
        }
       else 

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 78d48c84428ab3c30caaa3bbaa99d950a03b9f77..fe02be59d3acd212ef632173d5ba34d4946718f2 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5288,7 +5288,7 @@ gtk_clist_motion (GtkWidget      *widget,
        return FALSE;
 
       clist->htimer = g_timeout_add
-       (SCROLL_TIME, (GtkFunction) horizontal_timeout, clist);
+       (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
 
       if (!((x < 0 && clist->hadjustment->value == 0) ||
            (x >= clist->clist_window_width &&
@@ -5320,7 +5320,7 @@ gtk_clist_motion (GtkWidget      *widget,
        return FALSE;
 
       clist->vtimer = g_timeout_add (SCROLL_TIME,
-                                    (GtkFunction) vertical_timeout, clist);
+                                    (GSourceFunc) vertical_timeout, clist);
 
       if (clist->drag_button &&
          ((y < 0 && clist->focus_row == 0) ||

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index f8cc5c7bdc2753fb0b22057d3cae963027a521f3..bff45399f77f2683dee510e4190ab39684ff6ec1 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1160,6 +1160,8 @@ gtk_expander_animation_timeout (GtkExpander *expander)
   GdkRectangle area;
   gboolean finish = FALSE;
 
+  GDK_THREADS_ENTER();
+
   if (GTK_WIDGET_REALIZED (expander))
     {
       get_expander_bounds (expander, &area);
@@ -1199,6 +1201,8 @@ gtk_expander_animation_timeout (GtkExpander *expander)
       gtk_widget_queue_resize (GTK_WIDGET (expander));
     }
 
+  GDK_THREADS_LEAVE();
+
   return !finish;
 }
 

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 1ec1471dc8024a40c4e04ed5e267ebf2b52d58fd..59240ca610366543a48510e5ca45db989f74785d 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -553,7 +553,7 @@ gtk_list_motion_notify (GtkWidget      *widget,
       if (list->htimer == 0)
        {
          list->htimer = g_timeout_add
-           (SCROLL_TIME, (GtkFunction) gtk_list_horizontal_timeout, widget);
+           (SCROLL_TIME, (GSourceFunc) gtk_list_horizontal_timeout, widget);
          
          if (!((x < adj->value && adj->value <= 0) ||
                (x > adj->value + adj->page_size &&
@@ -601,7 +601,7 @@ gtk_list_motion_notify (GtkWidget      *widget,
   if (!((y < 0 && focus_row == 0) ||
        (y > widget->allocation.height && focus_row >= length - 1)))
     list->vtimer = g_timeout_add (SCROLL_TIME,
-                                 (GtkFunction) gtk_list_vertical_timeout,
+                                 (GSourceFunc) gtk_list_vertical_timeout,
                                  list);
 
   if (row != focus_row)

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 3a1b74ec14da23b08b46df9c8d9753b1e047b147..9e1c31765a06b5f3fb4b2e323dafcd03dae4ed4e 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1711,7 +1711,7 @@ gtk_notebook_arrow_button_press (GtkNotebook      *notebook,
       if (!notebook->timer)
        {
          notebook->timer = g_timeout_add (NOTEBOOK_INIT_SCROLL_DELAY, 
-                                          (GtkFunction) gtk_notebook_timer, 
+                                          (GSourceFunc) gtk_notebook_timer, 
                                           (gpointer) notebook);
          notebook->need_timer = TRUE;
        }
@@ -2552,7 +2552,7 @@ gtk_notebook_timer (GtkNotebook *notebook)
        {
          notebook->need_timer = FALSE;
          notebook->timer = g_timeout_add (NOTEBOOK_SCROLL_DELAY,
-                                          (GtkFunction) gtk_notebook_timer, 
+                                          (GSourceFunc) gtk_notebook_timer, 
                                           (gpointer) notebook);
        }
       else

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 96fb6d4957e65a0909fdb78e76130d873ab1006f..6d976896ead97371e6f8ecfda7d1b3984cbc52b4 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -748,7 +748,7 @@ gtk_selection_convert (GtkWidget *widget,
   
   current_retrievals = g_list_append (current_retrievals, info);
   gdk_selection_convert (widget->window, selection, target, time);
-  g_timeout_add (1000, (GtkFunction) gtk_selection_retrieval_timeout, info);
+  g_timeout_add (1000, (GSourceFunc) gtk_selection_retrieval_timeout, info);
   
   return TRUE;
 }
@@ -1275,7 +1275,7 @@ _gtk_selection_request (GtkWidget *widget,
                             gdk_window_get_events (info->requestor) |
                             GDK_PROPERTY_CHANGE_MASK);
       current_incrs = g_list_append (current_incrs, info);
-      g_timeout_add (1000, (GtkFunction)gtk_selection_incr_timeout, info);
+      g_timeout_add (1000, (GSourceFunc) gtk_selection_incr_timeout, info);
     }
   
   /* If it was a MULTIPLE request, set the property to indicate which

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index cf4565ecf543ffdc1acac0ab0641dfd0e4cbd48a..64b0df7bad2febd7c3581f392723c031bd7487ec 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1039,7 +1039,7 @@ start_spinning (GtkSpinButton *spin,
       spin->timer_step = step;
       spin->need_timer = TRUE;
       spin->timer = g_timeout_add (SPIN_BUTTON_INITIAL_TIMER_DELAY, 
-                                  (GtkFunction) gtk_spin_button_timer, 
+                                  (GSourceFunc) gtk_spin_button_timer, 
                                   (gpointer) spin);
     }
 
@@ -1190,7 +1190,7 @@ gtk_spin_button_timer (GtkSpinButton *spin_button)
        {
          spin_button->need_timer = FALSE;
          spin_button->timer = g_timeout_add (SPIN_BUTTON_TIMER_DELAY, 
-                                             (GtkFunction) gtk_spin_button_timer, 
+                                             (GSourceFunc) gtk_spin_button_timer, 
                                              (gpointer) spin_button);
        }
       else